Merge changes from emacs-24; up to r108039
authorChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:14:47 +0000 (13:14 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:14:47 +0000 (13:14 +0800)
commit3422f833f6f6b7287ad67ffc48899a332704ea8e
treeb86e4dc549acf76c2b12824e25331b9c03eeb927
parent444d6d8bd10c8598dbb77d4ca74053fcdba90706
parentd2800b965a2ae1a7bb03551fb3cbbbeda1c3c3b1
Merge changes from emacs-24; up to r108039